Don't leak pixbufs. (#352264, Ross Burton)

2006-08-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkstatusicon.c (gtk_status_icon_reset_image_data):
	Don't leak pixbufs.  (#352264, Ross Burton)

diff --git a/ChangeLog b/ChangeLog
index f3ad138c895b7fd296ffd0caa4ca6d1ad8bf121c..7d14086ea78faeafc42d7291c9579fb92134eb12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-26  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkstatusicon.c (gtk_status_icon_reset_image_data): 
+       Don't leak pixbufs.  (#352264, Ross Burton)
+
        * gtk/gtklinkbutton.c (set_link_underline): Don't leak
        PangoAttributes.  (#352391, Paolo Borelli)
 

diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index aa09dba858e2be11ea7f9ee64e177f44dd57fed1..9b1b6cfd1102e74e66c50b13c3f66e0df12cedb1 100755 (executable)
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -981,9 +981,6 @@ gtk_status_icon_reset_image_data (GtkStatusIcon *status_icon)
 {
   GtkStatusIconPrivate *priv = status_icon->priv;
 
-  priv->storage_type = GTK_IMAGE_EMPTY;
-  g_object_notify (G_OBJECT (status_icon), "storage-type");
-
   switch (priv->storage_type)
   {
     case GTK_IMAGE_PIXBUF:
@@ -1013,6 +1010,9 @@ gtk_status_icon_reset_image_data (GtkStatusIcon *status_icon)
       g_assert_not_reached ();
       break;
   }
+
+  priv->storage_type = GTK_IMAGE_EMPTY;
+  g_object_notify (G_OBJECT (status_icon), "storage-type");
 }
 
 static void